Merge ~ballot/content-cache-charm/+git/content-cache-charm:extend_nrpe_timeout into content-cache-charm:master

Proposed by Benjamin Allot
Status: Merged
Approved by: Junien F
Approved revision: 8fe7178db3de65bf74f29d4ea3ee05c9551a6258
Merged at revision: f563a832eb8f7a2f9a70009850e7d06ce9bcf23f
Proposed branch: ~ballot/content-cache-charm/+git/content-cache-charm:extend_nrpe_timeout
Merge into: content-cache-charm:master
Diff against target: 15 lines (+3/-1)
1 file modified
reactive/content_cache.py (+3/-1)
Reviewer Review Type Date Requested Status
Junien F Approve
Canonical IS Reviewers Pending
Review via email: mp+382564@code.launchpad.net

Commit message

Increase the timeout of the telegraf metrics check

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Junien F (axino) wrote :

+1 - I'd rather use -s but it doesn't really matter

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f563a832eb8f7a2f9a70009850e7d06ce9bcf23f

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/reactive/content_cache.py b/reactive/content_cache.py
2index af0376f..758a171 100644
3--- a/reactive/content_cache.py
4+++ b/reactive/content_cache.py
5@@ -496,7 +496,9 @@ def advertise_stats_endpoint():
6 @reactive.when_not('nagios-nrpe-telegraf.configured')
7 def check_haproxy_alerts():
8 nrpe_setup = nrpe.NRPE(hostname=nrpe.get_nagios_hostname(), primary=True)
9- cmd = '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 9103 -u /metrics -r "haproxy_rate"'
10+ # Because check_http is really inefficient, the parsing of the metrics is quite slow
11+ # hence increasing the timeout to 20 seconds
12+ cmd = '/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 9103 -u /metrics -r "haproxy_rate" -t 20'
13 nrpe_setup.add_check(
14 shortname='haproxy_telegraf_metrics',
15 description='Verify haproxy metrics are visible via telegraf subordinate',

Subscribers

People subscribed via source and target branches