Merge ~sajoupa/charm-telegraf:plugins-when-telegraf-installed into charm-telegraf:master

[Laurent Sesquès]

wait for telegraf to be installed before configuring plugins

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Laurent Sesquès (sajoupa)]

On an existing unit with configured extra plugins in telegraf.d/, switching from the deb install to the snap, the charm will try to write to /var/snap/telegraf/current/telegraf.d before the snap is installed, leading to e.g.:
FileNotFoundError: [Errno 2] No such file or directory: '/var/snap/telegraf/current/telegraf.d/haproxy.conf'

This patched fixes it by waiting for telegraf to be installed before configuring extra plugins.

[Laurent Sesquès (sajoupa)]

(successfully passed `make test`)

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[Alvaro Uria (aluria)]

Change looks good (no missing @when state in other functions). However, since the MP was proposed, the charm has been restructured and reactive/telegraf.py is now located in src/reactive/telegraf.py. Sorry for that. Could you rebase it against master so I can run the same "make test" you did and approve it?

Thank you.

review: Needs Fixing

[Laurent Sesquès (sajoupa)]

Rebased, replaced single quotes in @when with double quotes, and passed `make test`.

[Alvaro Uria (aluria)]

lgtm, thank you

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision ee1a92f9c0787413dea69a9a8c0d08a111a2d4be

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index 058380c..1b1208e 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -675,6 +675,7 @@ def configure_extra_plugins():
 
 
 @when("elasticsearch.available")
+@when("telegraf.installed")
 def elasticsearch_input(es):
     template = """
 [[inputs.elasticsearch]]
@@ -705,6 +706,7 @@ def elasticsearch_input(es):
 
 
 @when("memcached.available")
+@when("telegraf.installed")
 def memcached_input(memcache):
     template = """
 [[inputs.memcached]]
@@ -734,6 +736,7 @@ def memcached_input(memcache):
 
 
 @when("mongodb.database.available")
+@when("telegraf.installed")
 def mongodb_input(mongodb):
     template = """
 [[inputs.mongodb]]
@@ -764,6 +767,7 @@ def mongodb_input(mongodb):
 
 
 @when("mysql.available")
+@when("telegraf.installed")
 def mysql_input(mysql):
     contexts = []
     for relid, relation in context.Relations()[mysql.relation_name].items():
@@ -805,6 +809,7 @@ def postgresql_waiting():
 
 
 @when("postgresql.database.available", "postgresql.database.changed")
+@when("telegraf.installed")
 def postgresql_input():
     # The subordinate may be connected to several services.
     contexts = []
@@ -877,6 +882,7 @@ def render_postgresql_tmpl(contexts):
 
 
 @when("haproxy.available")
+@when("telegraf.installed")
 def haproxy_input(haproxy):
     template = """
 [[inputs.haproxy]]
@@ -919,6 +925,7 @@ def haproxy_input(haproxy):
 
 
 @when("apache.available")
+@when("telegraf.installed")
 def apache_input(apache):
     template = """
 [[inputs.apache]]
@@ -960,6 +967,7 @@ def apache_input(apache):
 
 
 @when("endpoint.redis.available")
+@when("telegraf.installed")
 def redis_input(redis):
     template = """
 [[inputs.redis]]
@@ -995,6 +1003,7 @@ def redis_input(redis):
 
 
 @when("endpoint.sentry.joined")
+@when("telegraf.installed")
 def sentry_input(sentry):
     template = """
 [[inputs.statsd]]
@@ -1024,6 +1033,7 @@ def sentry_input(sentry):
 
 
 @when("exec.available")
+@when("telegraf.installed")
 def exec_input(exec_rel):
     template = """
 {% for cmd in commands %}
@@ -1089,6 +1099,7 @@ def rabbitmq_input_setup(rabbitmq):
 
 
 @when("amqp.available")
+@when("telegraf.installed")
 def rabbitmq_input(rabbitmq):
     template = """
 [[inputs.rabbitmq]]
@@ -1129,6 +1140,7 @@ def rabbitmq_input_departed():
 
 
 @when("influxdb-api.available")
+@when("telegraf.installed")
 def influxdb_api_output(influxdb):
     required_keys = ["hostname", "port", "user", "password"]
     rels = hookenv.relations_of_type("influxdb-api")
@@ -1164,6 +1176,7 @@ def influxdb_api_output(influxdb):
 
 
 @when("prometheus-client.available")
+@when("telegraf.installed")
 def prometheus_client(prometheus):
     template = """
 [[outputs.prometheus_client]]