Volans has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/392631 )
Change subject: Metric alarms: fix dashboard link validation ...................................................................... Metric alarms: fix dashboard link validation * For multiple links the string starts with a single quote. Loosen the validation for now, this will be come an array in a later patch. Bug: T170353 Change-Id: I100eb8637ca51ef32f2fccb2f7a833a514c77b83 --- M modules/monitoring/manifests/check_prometheus.pp M modules/monitoring/manifests/graphite_anomaly.pp M modules/monitoring/manifests/graphite_threshold.pp 3 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/31/392631/1 diff --git a/modules/monitoring/manifests/check_prometheus.pp b/modules/monitoring/manifests/check_prometheus.pp index 9625e40..8307f99 100644 --- a/modules/monitoring/manifests/check_prometheus.pp +++ b/modules/monitoring/manifests/check_prometheus.pp @@ -90,7 +90,7 @@ { validate_re($method, '^(gt|ge|lt|le|eq|ne)$') validate_bool($nan_ok) - validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org') + validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org') $command = $nan_ok ? { true => 'check_prometheus_nan_ok', diff --git a/modules/monitoring/manifests/graphite_anomaly.pp b/modules/monitoring/manifests/graphite_anomaly.pp index 1d785c2..ef25521 100644 --- a/modules/monitoring/manifests/graphite_anomaly.pp +++ b/modules/monitoring/manifests/graphite_anomaly.pp @@ -68,7 +68,7 @@ $contact_group = 'admins', ) { - validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org') + validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org') if $over == true { $modifier = '--over' diff --git a/modules/monitoring/manifests/graphite_threshold.pp b/modules/monitoring/manifests/graphite_threshold.pp index b9839c9..4a51e30 100644 --- a/modules/monitoring/manifests/graphite_threshold.pp +++ b/modules/monitoring/manifests/graphite_threshold.pp @@ -75,7 +75,7 @@ $contact_group = 'admins', ) { - validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org') + validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org') # checkcommands.cfg's check_graphite_threshold command has # many positional arguments that -- To view, visit https://gerrit.wikimedia.org/r/392631 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I100eb8637ca51ef32f2fccb2f7a833a514c77b83 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Volans <rcocci...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits