Volans has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/392630 )
Change subject: Icinga notes_url: do not pre-encode the URLs ...................................................................... Icinga notes_url: do not pre-encode the URLs * Icinga will URL-encode the notes_url at notification time, hence do not encode them in the configuration. Bug: T170353 Change-Id: I07892971d2a1a71329deaff4e31bfe1511168403 --- M modules/profile/manifests/kafka/broker/monitoring.pp M modules/varnish/manifests/instance.pp 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Volans: Looks good to me, approved diff --git a/modules/profile/manifests/kafka/broker/monitoring.pp b/modules/profile/manifests/kafka/broker/monitoring.pp index fcb6661..ef138f8 100644 --- a/modules/profile/manifests/kafka/broker/monitoring.pp +++ b/modules/profile/manifests/kafka/broker/monitoring.pp @@ -47,7 +47,7 @@ # Alert on the average number of under replicated partitions over the last 30 minutes. monitoring::check_prometheus { 'kafka_broker_under_replicated_partitions': description => 'Kafka Broker Under Replicated Partitions', - dashboard_link => "https://grafana.wikimedia.org/dashboard/db/prometheus-kafka?panelId=29&fullscreen&orgId=1&var-datasource=${::site}%20prometheus%2Fops&var-cluster=${cluster}&var-kafka_brokers=${::hostname}", + dashboard_link => "https://grafana.wikimedia.org/dashboard/db/prometheus-kafka?panelId=29&fullscreen&orgId=1&var-datasource=${::site} prometheus/ops&var-cluster=${cluster}&var-kafka_brokers=${::hostname}", query => "scalar(avg_over_time(kafka_server_ReplicaManager_UnderReplicatedPartitions{${prometheus_labels}}[30m]))", warning => 5, critical => 10, @@ -57,7 +57,7 @@ # Alert on the average max replica lag over the last 30 minutes. monitoring::check_prometheus { 'kafka_broker_replica_max_lag': description => 'Kafka Broker Replica Max Lag', - dashboard_link => "https://grafana.wikimedia.org/dashboard/db/prometheus-kafka?panelId=16&fullscreen&orgId=1&var-datasource=${::site}%20prometheus%2Fops&var-cluster=${cluster}&var-kafka_brokers=${::hostname}", + dashboard_link => "https://grafana.wikimedia.org/dashboard/db/prometheus-kafka?panelId=16&fullscreen&orgId=1&var-datasource=${::site} prometheus/ops&var-cluster=${cluster}&var-kafka_brokers=${::hostname}", query => "scalar(avg_over_time(kafka_server_ReplicaFetcherManager_MaxLag{${prometheus_labels}}[30m]))", warning => $replica_maxlag_warning, critical => $replica_maxlag_critical, diff --git a/modules/varnish/manifests/instance.pp b/modules/varnish/manifests/instance.pp index b39e9f3..24df61e 100644 --- a/modules/varnish/manifests/instance.pp +++ b/modules/varnish/manifests/instance.pp @@ -51,7 +51,7 @@ monitoring::check_prometheus { "varnish-${inst}-check-child-start": description => 'Varnish child restarted', - dashboard_link => "https://grafana.wikimedia.org/dashboard/db/varnish-machine-stats?orgId=1&var-server=${::hostname}&var-datasource=${::site}%20prometheus%2Fops", + dashboard_link => "https://grafana.wikimedia.org/dashboard/db/varnish-machine-stats?orgId=1&var-server=${::hostname}&var-datasource=${::site} prometheus/ops", query => "scalar(varnish_mgt_child_start{${prometheus_labels}})", method => 'gt', warning => 1, -- To view, visit https://gerrit.wikimedia.org/r/392630 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I07892971d2a1a71329deaff4e31bfe1511168403 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org> Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org> Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org> Gerrit-Reviewer: Volans <rcocci...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits