Merge ~sajoupa/charm-telegraf:misc-fixes into charm-telegraf:master

[Laurent Sesquès]

small fixes: remove unneeded host.service_reload, add a debug log for configure_telegraf(), and remove un unneeded 'else:'

[Laurent Sesquès (sajoupa)]

passes `make test`

[Laurent Sesquès (sajoupa)]

pre-req MP: https://code.launchpad.net/~sajoupa/charm-telegraf/+git/telegraf-charm/+merge/397007

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

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

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

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Paul Goins (vultaire)]

I have a concern about a particular part I investigated for a different fix I did recently. I think this may introduce a regression.

review: Needs Fixing

[Laurent Sesquès (sajoupa)]

replied inline.

[Laurent Sesquès (sajoupa)]

> I have a concern about a particular part I investigated for a different fix I
> did recently. I think this may introduce a regression.
now fixed.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

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

Failed to merge change (unable to merge source repository due to conflicts), setting status to needs review.

Unmerged commits

df744b3... by Laurent Sesquès on 2021-02-04

configure_telegraf: keep host.service_reload(service) after configuring exec_metrics, as it'won't get caught by start_or_restart()

8f023f5... by Laurent Sesquès on 2021-01-27

small fixes: remove unneeded host.service_reload, add a debug log for configure_telegraf(), and remove un unneeded 'else:'

fde6022... by Laurent Sesquès on 2021-01-27

Add support for ip_range in the prometheus-client output plugin

ea55458... by Laurent Sesquès on 2021-01-27

when related with prometheus-client, if prometheus_output_port is unset, use :9103 by default instead of 9126

diff --git a/src/reactive/telegraf.py b/src/reactive/telegraf.py
index f6240d6..b510dba 100644
--- a/src/reactive/telegraf.py
+++ b/src/reactive/telegraf.py
@@ -334,8 +334,7 @@ def get_prometheus_port():
         return False
     if config.get("prometheus_output_port") == "default":
         return 9103
-    else:
-        return int(config.get("prometheus_output_port"))
+    return int(config.get("prometheus_output_port"))
 
 
 def get_prometheus_ip_range():
@@ -429,6 +428,7 @@ def update_sysstat_config_with_sdac_xall(path="/etc/sysstat/sysstat"):
 
 
 def configure_telegraf():  # noqa: C901
+    hookenv.log("Generating telegraf.conf", level=hookenv.DEBUG)
     update_sysstat_config_with_sdac_xall()
     config = hookenv.config()
     context = config.copy()
@@ -577,6 +577,7 @@ def configure_telegraf():  # noqa: C901
         context=context,
     )
 
+    # Make sure that only the right service is enabled, then defer to start_or_restart()
     for service in [DEB_SERVICE, SNAP_SERVICE]:
         if service == get_service():
             host.service_resume(service)