feat: add location tier presets (3, 6, 15) to Globalping settings
## Changes ### Server - Expand LOCATION_MAP to support city/country-level locations for the 15-location tier (US East/West, Toronto, London, Frankfurt, Amsterdam, Warsaw, Tokyo, Singapore, Mumbai, Sydney, Brazil, Santiago, Johannesburg, Dubai) - Add globalpingLocationsTier field to Settings type, Mongoose model, repository mapper, and Joi validation (valid: 3, 6, 15, default: 6) - Update getGlobalpingLocations endpoint to return locations based on the configured tier from settings - Pass settingsService to MonitorController for tier lookup ### Client - Add tier selector (radio buttons) to SettingsGlobalping component with descriptions for each option: - 3 locations: North America, Europe, Asia - 6 locations: all continents - 15 locations: city-level global coverage - Add rate limits info box explaining credit usage per tier: - Without token: 250 tests/hour - With free token: 500 tests/hour - GitHub sponsors: higher limits - Add all translation keys for tier labels, descriptions, and rate info ## Benefits - Admins can choose the right balance of coverage vs API usage - Rate limit info helps users decide whether they need authentication
This commit is contained in:
1 parent
134c2ebbf4
commit
27c3a9e12b
12 files changed
+202
-10
No files matched your search
@@ -30,6 +30,7 @@ export const useSettingsForm = ({ data = null }: UseSettingsFormOptions = {}) =>
|
||||
checkTTL: data?.checkTTL ?? 30,
|
||||
pagespeedApiKey: "",
|
||||
globalpingApiKey: "",
|
||||
globalpingLocationsTier: data?.globalpingLocationsTier ?? 6,
|
||||
systemEmailPassword: "",
|
||||
};
|
||||
|
||||
|
||||
@@ -2,12 +2,14 @@ import Box from "@mui/material/Box";
|
||||
import Stack from "@mui/material/Stack";
|
||||
import Typography from "@mui/material/Typography";
|
||||
import Button from "@mui/material/Button";
|
||||
import RadioGroup from "@mui/material/RadioGroup";
|
||||
import FormControlLabel from "@mui/material/FormControlLabel";
|
||||
import Radio from "@mui/material/Radio";
|
||||
import ConfigBox from "@/Components/v1/ConfigBox/index.jsx";
|
||||
import TextInput from "@/Components/v1/Inputs/TextInput/index.jsx";
|
||||
import { PasswordEndAdornment } from "@/Components/v1/Inputs/TextInput/Adornments/index.jsx";
|
||||
import { useTheme } from "@emotion/react";
|
||||
import { PropTypes } from "prop-types";
|
||||
import { useState } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Controller } from "react-hook-form";
|
||||
|
||||
@@ -52,7 +54,7 @@ const SettingsGlobalping = ({
|
||||
{...field}
|
||||
label={t("pages.settings.globalpingSettings.labelApiKey")}
|
||||
type={"password"}
|
||||
optionalLabel="(Optional)"
|
||||
optionalLabel={t("pages.settings.globalpingSettings.optionalLabel")}
|
||||
endAdornment={<PasswordEndAdornment />}
|
||||
error={!!fieldState.error}
|
||||
helperText={fieldState.error?.message}
|
||||
@@ -79,6 +81,108 @@ const SettingsGlobalping = ({
|
||||
</Button>
|
||||
</Box>
|
||||
)}
|
||||
|
||||
<Box>
|
||||
<Typography
|
||||
variant="h2"
|
||||
sx={{ mb: theme.spacing(2) }}
|
||||
>
|
||||
{t("pages.settings.globalpingSettings.locationsTierTitle")}
|
||||
</Typography>
|
||||
<Typography sx={{ mb: theme.spacing(8), color: theme.palette.text.secondary }}>
|
||||
{t("pages.settings.globalpingSettings.locationsTierDescription")}
|
||||
</Typography>
|
||||
<Controller
|
||||
name="globalpingLocationsTier"
|
||||
control={control}
|
||||
defaultValue={defaults.globalpingLocationsTier}
|
||||
render={({ field }) => (
|
||||
<RadioGroup
|
||||
value={String(field.value ?? 6)}
|
||||
onChange={(e) => field.onChange(Number(e.target.value))}
|
||||
>
|
||||
<FormControlLabel
|
||||
value="3"
|
||||
control={<Radio />}
|
||||
label={
|
||||
<Box>
|
||||
<Typography fontWeight={500}>
|
||||
{t("pages.settings.globalpingSettings.tier3Label")}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t("pages.settings.globalpingSettings.tier3Description")}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
sx={{ mb: theme.spacing(4), alignItems: "flex-start" }}
|
||||
/>
|
||||
<FormControlLabel
|
||||
value="6"
|
||||
control={<Radio />}
|
||||
label={
|
||||
<Box>
|
||||
<Typography fontWeight={500}>
|
||||
{t("pages.settings.globalpingSettings.tier6Label")}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t("pages.settings.globalpingSettings.tier6Description")}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
sx={{ mb: theme.spacing(4), alignItems: "flex-start" }}
|
||||
/>
|
||||
<FormControlLabel
|
||||
value="15"
|
||||
control={<Radio />}
|
||||
label={
|
||||
<Box>
|
||||
<Typography fontWeight={500}>
|
||||
{t("pages.settings.globalpingSettings.tier15Label")}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="text.secondary">
|
||||
{t("pages.settings.globalpingSettings.tier15Description")}
|
||||
</Typography>
|
||||
</Box>
|
||||
}
|
||||
sx={{ alignItems: "flex-start" }}
|
||||
/>
|
||||
</RadioGroup>
|
||||
)}
|
||||
/>
|
||||
</Box>
|
||||
|
||||
<Box
|
||||
sx={{
|
||||
p: theme.spacing(8),
|
||||
borderRadius: theme.spacing(2),
|
||||
border: `1px solid ${theme.palette.primary.lowContrast}`,
|
||||
backgroundColor: theme.palette.tertiary?.main || theme.palette.background.default,
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
variant="h2"
|
||||
sx={{ mb: theme.spacing(4) }}
|
||||
>
|
||||
{t("pages.settings.globalpingSettings.rateLimitsTitle")}
|
||||
</Typography>
|
||||
<Typography variant="body2" color="text.secondary" sx={{ mb: theme.spacing(4) }}>
|
||||
{t("pages.settings.globalpingSettings.rateLimitsDescription")}
|
||||
</Typography>
|
||||
<Box component="ul" sx={{ m: 0, pl: theme.spacing(8) }}>
|
||||
<Typography component="li" variant="body2" color="text.secondary" sx={{ mb: theme.spacing(2) }}>
|
||||
{t("pages.settings.globalpingSettings.rateLimitNoAuth")}
|
||||
</Typography>
|
||||
<Typography component="li" variant="body2" color="text.secondary" sx={{ mb: theme.spacing(2) }}>
|
||||
{t("pages.settings.globalpingSettings.rateLimitAuth")}
|
||||
</Typography>
|
||||
<Typography component="li" variant="body2" color="text.secondary">
|
||||
{t("pages.settings.globalpingSettings.rateLimitSponsor")}
|
||||
</Typography>
|
||||
</Box>
|
||||
<Typography variant="body2" color="text.secondary" sx={{ mt: theme.spacing(4) }}>
|
||||
{t("pages.settings.globalpingSettings.rateLimitsNote")}
|
||||
</Typography>
|
||||
</Box>
|
||||
</Stack>
|
||||
</ConfigBox>
|
||||
);
|
||||
|
||||
@@ -21,6 +21,7 @@ export interface Settings {
|
||||
systemEmailRequireTLS: boolean;
|
||||
systemEmailRejectUnauthorized: boolean;
|
||||
showURL: boolean;
|
||||
globalpingLocationsTier?: number;
|
||||
singleton: boolean;
|
||||
globalThresholds?: SettingsThresholds;
|
||||
createdAt: string;
|
||||
|
||||
@@ -35,6 +35,7 @@ export const settingsSchema = z.object({
|
||||
.max(365, "Maximum 365 days"),
|
||||
pagespeedApiKey: optionalString(),
|
||||
globalpingApiKey: optionalString(),
|
||||
globalpingLocationsTier: z.coerce.number().optional(),
|
||||
systemEmailHost: z.preprocess(
|
||||
(val) =>
|
||||
val === "" || val === null || val === undefined ? undefined : String(val).trim(),
|
||||
|
||||
@@ -957,10 +957,25 @@
|
||||
"title": "Google PageSpeed API key"
|
||||
},
|
||||
"globalpingSettings": {
|
||||
"description": "Enter your Globalping API key to enable multi-location uptime monitoring. This allows checking your monitors from different geographic regions.",
|
||||
"description": "Configure Globalping to run uptime checks from multiple geographic regions worldwide.",
|
||||
"labelApiKeySet": "API key is set. Click Reset to change it.",
|
||||
"labelApiKey": "Globalping API key",
|
||||
"title": "Globalping API key"
|
||||
"optionalLabel": "(Optional)",
|
||||
"title": "Globalping",
|
||||
"locationsTierTitle": "Global locations",
|
||||
"locationsTierDescription": "Choose how many probe locations are available when creating monitors.",
|
||||
"tier3Label": "3 locations — core regions",
|
||||
"tier3Description": "North America, Europe, Asia",
|
||||
"tier6Label": "6 locations — all continents",
|
||||
"tier6Description": "North America, Europe, Asia, South America, Oceania, Africa",
|
||||
"tier15Label": "15 locations — city level",
|
||||
"tier15Description": "US East, US West, Canada, UK, Germany, Netherlands, Poland, Japan, Singapore, India, Australia, Brazil, Chile, South Africa, UAE",
|
||||
"rateLimitsTitle": "Rate limits",
|
||||
"rateLimitsDescription": "Globalping limits how many tests you can run per hour. Each location check on each monitor uses 1 credit per interval.",
|
||||
"rateLimitNoAuth": "Without a token: 250 tests per hour (no authentication needed)",
|
||||
"rateLimitAuth": "With a free token: 500 tests per hour (sign in at dash.globalping.io)",
|
||||
"rateLimitSponsor": "GitHub sponsors: higher limits based on sponsorship tier + hosting probes",
|
||||
"rateLimitsNote": "For example, 3 monitors with 5 locations each, checked every minute, uses 15 credits per minute (900/hour). Choose your tier accordingly."
|
||||
},
|
||||
"saveButtonLabel": "Save",
|
||||
"statsSettings": {
|
||||
|
||||
Reference in new issue
Block a user