Merge ~alephnull-b/charm-thruk-master:bionic-support into ~nagios-charmers/charm-thruk-master:master

[Alok G Singh]

Tested bionic support.
Fixes lp#1805101

[Andrea Ieri (aieri)]

looks good, but I think it'd be cleaner to have two separate commits, as the issues fixed are conceptually separate

review: Needs Fixing

[Chris Sanders (chris.sanders)]

> looks good, but I think it'd be cleaner to have two separate commits, as the
> issues fixed are conceptually separate

While I agree in concept, two lines of change splitting into two one line changes seems a bit much IMO.

review: Approve

[Chris Sanders (chris.sanders)]

> > looks good, but I think it'd be cleaner to have two separate commits, as the
> > issues fixed are conceptually separate
>
> While I agree in concept, two lines of change splitting into two one line
> changes seems a bit much IMO.

Oh and if a bug is closed it should be linked to the review so it updates when accepted and merged.

diff --git a/hooks/services.py b/hooks/services.py
old mode 100644
new mode 100755
index 959f668..e661f7e
--- a/hooks/services.py
+++ b/hooks/services.py
@@ -12,7 +12,7 @@ def manage():
     config = hookenv.config()
     manager = ServiceManager([
         {
-            'service': 'thruk-master',
+            'service': 'thruk',
             'ports': [80, 443],  # ports to after start
             # 'provided_data': [
             #    # context managers for provided relations
diff --git a/metadata.yaml b/metadata.yaml
index 376b35a..df97618 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -8,6 +8,7 @@ tags:
 series:
   - trusty
   - xenial
+  - bionic
 subordinate: false
 provides:
   website: