Merge ~axino/charm-telegraf/+git/telegraf-charm:sentry_relation into ~telegraf-charmers/charm-telegraf:master

Proposed by Junien F
Status: Merged
Approved by: Jamon Camisso
Approved revision: d619153cd4775ef10de893e42d573bc7a9ee2fe1
Merged at revision: 20517fdf52cfd62d9067de3e398eb89af0862904
Proposed branch: ~axino/charm-telegraf/+git/telegraf-charm:sentry_relation
Merge into: ~telegraf-charmers/charm-telegraf:master
Diff against target: 64 lines (+36/-0)
3 files modified
hooks/relations/sentry-metrics/requires.py (+5/-0)
metadata.yaml (+3/-0)
reactive/telegraf.py (+28/-0)
Reviewer Review Type Date Requested Status
Telegraf Charmers Pending
Review via email: mp+359754@code.launchpad.net

Commit message

add sentry relation

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
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 20517fdf52cfd62d9067de3e398eb89af0862904

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/hooks/relations/sentry-metrics/requires.py b/hooks/relations/sentry-metrics/requires.py
0new file mode 1006440new file mode 100644
index 0000000..4a3524f
--- /dev/null
+++ b/hooks/relations/sentry-metrics/requires.py
@@ -0,0 +1,5 @@
1from charms import reactive
2
3
4class SentryEndpoint(reactive.Endpoint):
5 pass
diff --git a/metadata.yaml b/metadata.yaml
index 912f6f5..bf43b34 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -69,6 +69,9 @@ requires:
69 redis:69 redis:
70 interface: redis70 interface: redis
71 scope: container71 scope: container
72 sentry:
73 interface: sentry-metrics
74 scope: container
72provides:75provides:
73 prometheus-client:76 prometheus-client:
74 interface: http77 interface: http
diff --git a/reactive/telegraf.py b/reactive/telegraf.py
index b2732f1..964f497 100644
--- a/reactive/telegraf.py
+++ b/reactive/telegraf.py
@@ -619,6 +619,34 @@ def redis_input(redis):
619 set_state('telegraf.needs_reload')619 set_state('telegraf.needs_reload')
620620
621621
622@when('endpoint.sentry.joined')
623def sentry_input(sentry):
624 template = """
625[[inputs.statsd]]
626 protocol = "udp"
627 service_address = ":8125"
628 delete_gauges = false
629 delete_counters = false
630 delete_sets = false
631 delete_timings = false
632"""
633 config_path = '{}/{}.conf'.format(get_configs_dir(), 'sentry')
634
635 rels = hookenv.relations_of_type('sentry')
636 if rels:
637 for rel in rels:
638 input_config = render_template(template, {}) + \
639 render_extra_options("inputs", "sentry")
640 hookenv.log("Updating {} plugin config file".format('sentry'))
641 host.write_file(config_path, input_config.encode('utf-8'))
642 set_state('plugins.sentry.configured')
643 elif os.path.exists(config_path):
644 os.unlink(config_path)
645 remove_state('plugins.sentry.configured')
646
647 set_state('telegraf.needs_reload')
648
649
622@when('exec.available')650@when('exec.available')
623def exec_input(exec_rel):651def exec_input(exec_rel):
624 template = """652 template = """

Subscribers

People subscribed via source and target branches

to all changes: