diff --git a/core/uwsgi.c b/core/uwsgi.c
index 47b831ca..c0cdaa03 100644
--- a/core/uwsgi.c
+++ b/core/uwsgi.c
@@ -512,6 +512,8 @@ static struct uwsgi_option uwsgi_base_options[] = {
 
 	{"enable-metrics", no_argument, 0, "enable metrics subsystem", uwsgi_opt_true, &uwsgi.has_metrics, UWSGI_OPT_MASTER},
 	{"metric", required_argument, 0, "add a custom metric", uwsgi_opt_add_string_list, &uwsgi.additional_metrics, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
+	{"metric-threshold", required_argument, 0, "add a metric threshold/alarm", uwsgi_opt_add_string_list, &uwsgi.metrics_threshold, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
+	{"metric-alarm", required_argument, 0, "add a metric threshold/alarm", uwsgi_opt_add_string_list, &uwsgi.metrics_threshold, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
 	{"metrics-dir", required_argument, 0, "exports metrics as text files in the specified directory", uwsgi_opt_set_str, &uwsgi.metrics_dir, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
 	{"metrics-dir-restore", no_argument, 0, "restore last value taken from the metrics dir", uwsgi_opt_true, &uwsgi.metrics_dir_restore, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
 	{"metric-dir", required_argument, 0, "exports metrics as text files in the specified directory", uwsgi_opt_set_str, &uwsgi.metrics_dir, UWSGI_OPT_METRICS|UWSGI_OPT_MASTER},
diff --git a/uwsgi.h b/uwsgi.h
index e2eed4d4..037135b6 100644
--- a/uwsgi.h
+++ b/uwsgi.h
@@ -2579,6 +2579,7 @@ struct uwsgi_server {
 	int metrics_dir_restore;
 	uint64_t metrics_cnt;
 	struct uwsgi_string_list *additional_metrics;
+	struct uwsgi_string_list *metrics_threshold;
 
 	int (*wait_write_hook) (int, int);
 	int (*wait_read_hook) (int, int);