From 9582b45dab89ac551b8ba0e4991711255dae213a Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Fri, 24 Oct 2025 08:26:06 +0200 Subject: ... --- .../ccert-policy-server/ccert_policy_server/__main__.py | 2 +- hosts/vidhar/prometheus/default.nix | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'hosts') diff --git a/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py b/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py index 7c931559..45619fb0 100644 --- a/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py +++ b/hosts/surtr/email/ccert-policy-server/ccert_policy_server/__main__.py @@ -35,7 +35,7 @@ class PolicyHandler(StreamRequestHandler): user = self.args['ccert_subject'] relay_eligible = True - if user: + if user and '@' in self.args['sender']: with self.server.db_pool.connection() as conn: local, domain = self.args['sender'].split(sep='@', maxsplit=1) extension = None diff --git a/hosts/vidhar/prometheus/default.nix b/hosts/vidhar/prometheus/default.nix index ad6a0619..df135b58 100644 --- a/hosts/vidhar/prometheus/default.nix +++ b/hosts/vidhar/prometheus/default.nix @@ -301,17 +301,17 @@ in { } { name = "dsl-disconnects"; rules = [ - { record = "dsl_dsl_uptime_seconds:resets_per_hour"; - expr = "resets(dsl_dsl_uptime_seconds[1h])"; + { record = "dsl_uptime_seconds:resets_per_hour"; + expr = "resets(dsl_uptime_seconds[1h])"; } - { record = "dsl_dsl_uptime_seconds:resets_per_day"; - expr = "resets(dsl_dsl_uptime_seconds[1d])"; + { record = "dsl_uptime_seconds:resets_per_day"; + expr = "resets(dsl_uptime_seconds[1d])"; } - { record = "dsl_dsl_uptime_seconds:resets_per_week"; - expr = "resets(dsl_dsl_uptime_seconds[1w])"; + { record = "dsl_uptime_seconds:resets_per_week"; + expr = "resets(dsl_uptime_seconds[1w])"; } - { record = "dsl_dsl_uptime_seconds:avg_resets_per_day"; - expr = "avg_over_time(dsl_dsl_uptime_seconds:resets_per_day[1w])"; + { record = "dsl_uptime_seconds:avg_resets_per_day"; + expr = "avg_over_time(dsl_uptime_seconds:resets_per_day[1w])"; } ]; } -- cgit v1.2.3