Merge ~deej/charm-telegraf/+git/bionic:master into ~telegraf-charmers/charm-telegraf:master

Proposed by David Lawson
Status: Merged
Approved by: Tom Haddon
Approved revision: b3916ad7bdbc1b1892fd43fecafb1a26827759e9
Merged at revision: c6193e2b6b0a40bd976871256692dbf694928a77
Proposed branch: ~deej/charm-telegraf/+git/bionic:master
Merge into: ~telegraf-charmers/charm-telegraf:master
Diff against target: 24 lines (+2/-0)
2 files modified
metadata.yaml (+1/-0)
reactive/telegraf.py (+1/-0)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+344492@code.launchpad.net

Commit message

Add bionic support.

To post a comment you must log in.
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
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 c6193e2b6b0a40bd976871256692dbf694928a77

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/metadata.yaml b/metadata.yaml
2index 1405d22..d590b29 100644
3--- a/metadata.yaml
4+++ b/metadata.yaml
5@@ -33,6 +33,7 @@ tags:
6 series:
7 - xenial
8 - trusty
9+ - bionic
10 subordinate: true
11 requires:
12 mysql:
13diff --git a/reactive/telegraf.py b/reactive/telegraf.py
14index bc80995..94de186 100644
15--- a/reactive/telegraf.py
16+++ b/reactive/telegraf.py
17@@ -187,6 +187,7 @@ def check_prometheus_port(key, new_port):
18 existing_port = kv.get(unitdata_key)
19 if existing_port != new_port:
20 hookenv.open_port(new_port)
21+ hookenv.log("Opened port {}".format(new_port))
22 if existing_port: # Dont try to close non existing ports
23 hookenv.close_port(existing_port)
24 charms.promreg.deregister(None, existing_port)

Subscribers

People subscribed via source and target branches

to all changes: