Merge ~brad-marshall/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:ceph-relation into ~prometheus-charmers/charm-prometheus-ceph-exporter/+git/prometheus-ceph-exporter-charm:master

[Brad Marshall]

Add in ceph-client relationship so we no longer have to target a ceph-mon node, tidy up the code etc.

[Paul Gear (paulgear)]

This chrm needs disentangling from the snap layer and turning into its own layer before we move forward with it.

review: Needs Fixing

[Barry Price (barryprice)]

+1 LGTM

review: Approve

diff --git a/README.md b/README.md
index 2559ee3..59a0103 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ From the MAAS host:
 # Deploy the charm
 
     juju deploy local:xenial/prometheus-ceph-exporter
+    juju add-relation prometheus-ceph-exporter ceph-mon:client
 
 To change the port, refer to the daemon_arguments provided by the snap package at:
     /var/snap/prometheus-ceph-exporter/current/daemon_arguments
diff --git a/bin/layer_option b/bin/layer_option
 deleted file mode 100755
index 90dc400..0000000
--- a/bin/layer_option
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python3
-
-import sys
-sys.path.append('lib')
-
-import argparse
-from charms.layer import options
-
-
-parser = argparse.ArgumentParser(description='Access layer options.')
-parser.add_argument('section',
-                    help='the section, or layer, the option is from')
-parser.add_argument('option',
-                    help='the option to access')
-
-args = parser.parse_args()
-value = options(args.section).get(args.option, '')
-if isinstance(value, bool):
-    sys.exit(0 if value else 1)
-elif isinstance(value, list):
-    for val in value:
-        print(val)
-else:
-    print(value)
diff --git a/config.yaml b/config.yaml
index 05b882e..4cf7a63 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,27 +1,9 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This file is part of the Snap layer for Juju.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-"options":
-  "snap_proxy":
-    "description": "HTTP/HTTPS web proxy for Snappy to use when accessing the snap\
-      \ store.\n"
-    "type": "string"
-    "default": ""
-  "snap_channel":
-    "default": "stable"
-    "type": "string"
-    "description": |
-      If install_method is set to "snap" this option controlls channel name.
-      Supported values are: "stable", "candidate", "beta" and "edge"
+options:
+  username:
+    description: Username to use for ceph mons - defaults to prometheus-ceph-exporter.
+    type: string
+    default: "prometheus-ceph-exporter"
+  daemon_arguments:
+    description: Daemon arguments to pass to the exporter.
+    type: string
+    default: ""
diff --git a/layer.yaml b/layer.yaml
index a3d662a..96ddd93 100644
--- a/layer.yaml
+++ b/layer.yaml
@@ -1,15 +1,10 @@
-"options":
-  "basic":
-    "use_venv": !!bool "true"
-    "packages": []
-    "include_system_packages": !!bool "false"
-  "snap": {}
-  "prometheus-ceph-exporter": {}
-"includes":
-- "layer:basic"
-- "interface:http"
-- "layer:snap"
-"repo": "https://git.launchpad.net/prometheus-ceph-exporter-charm"
-"ignore":
-  "prometheus-ceph-exporter": [".*.swp"]
-"is": "prometheus-ceph-exporter"
+includes: ['layer:basic', 'interface:http', 'layer:snap', 'interface:ceph-client']
+repo: 'https://git.launchpad.net/prometheus-ceph-exporter-charm'
+ignore: ['.*.swp' ]
+options:
+  basic:
+    use_venv: true
+    include_system_packages: true
+  snap:
+    prometheus-ceph-exporter:
+      channel: stable
diff --git a/metadata.yaml b/metadata.yaml
index e76e3ef..55f3cf5 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,6 +1,6 @@
 name: prometheus-ceph-exporter
 summary: Ceph exporter for Prometheus
-maintainer: Giorgio Di Guardia <[e-mail]>
+maintainer: Prometheus Charmers <[e-mail]>
 description: |
   This is an exporter that exposes information gathered from Ceph
   for use by the Prometheus monitoring system.
@@ -9,7 +9,11 @@ tags:
   - prometheus
 series:
   - xenial
+  - trusty
 subordinate: false
 provides:
   ceph-exporter:
     interface: http
+requires:
+  ceph:
+    interface: ceph-client
diff --git a/reactive/__init__.py b/reactive/__init__.py
 deleted file mode 100644
index e69de29..0000000
--- a/reactive/__init__.py
+++ /dev/null
diff --git a/reactive/prometheus-ceph-exporter.py b/reactive/prometheus-ceph-exporter.py
index c6ba0c9..41e9e69 100644
--- a/reactive/prometheus-ceph-exporter.py
+++ b/reactive/prometheus-ceph-exporter.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import yaml
-import subprocess
+import os
 
 from charmhelpers.core import host, hookenv
 from charmhelpers.core.templating import render
@@ -21,37 +21,30 @@ from charms.reactive import (
     when, when_not, set_state, remove_state
 )
 from charms.reactive.helpers import any_file_changed, data_changed
-from charms.layer import snap
+# from charms.layer import snap
 
+from charmhelpers.fetch import (
+    apt_install,
+)
 
 SNAP_NAME = 'prometheus-ceph-exporter'
 SVC_NAME = 'snap.prometheus-ceph-exporter.ceph-exporter'
 SNAP_DATA = '/var/snap/' + SNAP_NAME + '/current/'
 PORT_DEF = 9128
 
+
 def templates_changed(tmpl_list):
     return any_file_changed(['templates/{}'.format(x) for x in tmpl_list])
 
 
-@when_not('ceph-exporter.installed')
-def install_packages():
-    hookenv.status_set('maintenance', 'Installing software')
-    config = hookenv.config()
-    channel = config.get('snap_channel', 'stable')
-    snap.install(SNAP_NAME, channel=channel, force_dangerous=False)
-    set_state('ceph-exporter.do-auth-config')
-    set_state('ceph-exporter.installed')
-    set_state('ceph-exporter.do-check-reconfig')
-
-
 def validate_config(filename):
     return yaml.safe_load(open(filename))
 
 
-@when('ceph-exporter.installed')
+@when('snap.installed.prometheus-ceph-exporter')
 @when('ceph-exporter.do-reconfig-yaml')
 def write_ceph_exporter_config_yaml():
-    config = hookenv.config()
+    # config = hookenv.config()
     hookenv.open_port(PORT_DEF)
     set_state('ceph-exporter.do-restart')
     remove_state('ceph-exporter.do-reconfig-yaml')
@@ -71,19 +64,44 @@ def check_reconfig_ceph_exporter():
     remove_state('ceph-exporter.do-check-reconfig')
 
 
-@when('ceph-exporter.do-auth-config')
-def ceph_auth_config():
-    # Working around snap confinement, creating ceph user, moving conf to snap confined environment ($SNAP_DATA)
-    hookenv.status_set('maintenance', 'Creating ceph user')
-    hookenv.log('Creating exporter ceph user')
-    subprocess.check_call(['ceph', 'auth', 'add', 'client.exporter', 'mon', "allow r"])
-    hookenv.log('Creating exporter keyring file onto {}'.format(SNAP_DATA))
-    subprocess.check_call(['ceph', 'auth', 'get', 'client.exporter', '-o', SNAP_DATA + 'ceph.client.exporter.keyring'])
-    hookenv.log('Copying ceph.conf onto {}'.format(SNAP_DATA))
-    subprocess.check_call(['cp', '/etc/ceph/ceph.conf', SNAP_DATA + 'ceph.conf'])
-    hookenv.log('Modifying snap ceph.conf to point to $SNAP_DATA')
-    subprocess.check_call(['sed', '-i', 's=/etc/ceph/=' + SNAP_DATA + '=g', SNAP_DATA + 'ceph.conf'])
-    remove_state('ceph-exporter.do-auth-config')
+@when('ceph.connected')
+def ceph_connected(ceph_client):
+    apt_install(['ceph-common', 'python-ceph'])
+
+
+@when('ceph.available')
+def ceph_ready(ceph_client):
+    username = hookenv.config('username')
+    daemon_conf = os.path.join(os.sep, SNAP_DATA, 'daemon_arguments')
+    charm_ceph_conf = os.path.join(os.sep, SNAP_DATA, 'ceph.conf')
+    cephx_key = os.path.join(os.sep, SNAP_DATA, 'ceph.client.%s.keyring' % (username))
+
+    ceph_context = {
+        'auth_supported': ceph_client.auth(),
+        'mon_hosts': ceph_client.mon_hosts(),
+        'service_name': username,
+        'ringpath': SNAP_DATA,
+    }
+
+    # Write out the ceph.conf
+    render('ceph.conf', charm_ceph_conf, ceph_context)
+
+    ceph_key_context = {
+        'key': str(ceph_client.key()),
+        'username': username,
+    }
+
+    # Write out the cephx_key also
+    render('ceph.keyring', cephx_key, ceph_key_context)
+
+    daemon_context = {
+        'daemon_arguments': hookenv.config('daemon_arguments'),
+        'username': username,
+    }
+
+    # Write out the daemon.arguments file
+    render('daemon_arguments', daemon_conf, daemon_context)
+
 
 @when('ceph-exporter.do-restart')
 def restart_ceph_exporter():
@@ -100,6 +118,6 @@ def restart_ceph_exporter():
 
 # Relations
 @when('ceph-exporter.started')
-@when('ceph-exporter.available') # Relation name is "ceph-exporter"
+@when('ceph-exporter.available')  # Relation name is "ceph-exporter"
 def configure_ceph_exporter_relation(target):
     target.configure(PORT_DEF)
diff --git a/reactive/snap.py b/reactive/snap.py
 deleted file mode 100644
index d357e05..0000000
--- a/reactive/snap.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This file is part of the Snap layer for Juju.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-'''
-charms.reactive helpers for dealing with Snap packages.
-'''
-import os.path
-import shutil
-import subprocess
-from textwrap import dedent
-import time
-
-from charmhelpers.core import hookenv, host
-from charms import layer
-from charms import reactive
-from charms.layer import snap
-from charms.reactive import hook
-from charms.reactive.helpers import data_changed
-
-
-def install():
-    opts = layer.options('snap')
-    for snapname, snap_opts in opts.items():
-        snap.install(snapname, **snap_opts)
-    if data_changed('snap.install.opts', opts):
-        snap.connect_all()
-
-
-def refresh():
-    opts = layer.options('snap')
-    for snapname, snap_opts in opts.items():
-        snap.refresh(snapname, **snap_opts)
-    snap.connect_all()
-
-
-@hook('upgrade-charm')
-def upgrade_charm():
-    refresh()
-
-
-def get_series():
-    return subprocess.check_output(['lsb_release', '-sc'],
-                                   universal_newlines=True).strip()
-
-
-def ensure_snapd():
-    # I don't use the apt layer, because that would tie this layer
-    # too closely to apt packaging. Perhaps this is a snap-only system.
-    if not shutil.which('snap'):
-        cmd = ['apt', 'install', '-y', 'snapd']
-        subprocess.check_call(cmd, universal_newlines=True)
-    # Work around lp:1628289. Remove this stanza once snapd depends
-    # on the necessary package and snaps work in lxd xenial containers
-    # without the workaround.
-    if get_series() == 'xenial' and not shutil.which('squashfuse'):
-        cmd = ['apt', 'install', '-y', 'squashfuse']
-        subprocess.check_call(cmd, universal_newlines=True)
-
-
-def update_snap_proxy():
-    # This is a hack based on
-    # https://bugs.launchpad.net/layer-snap/+bug/1533899/comments/1
-    # Do it properly when Bug #1533899 is addressed.
-    # Note we can't do this in a standard reactive handler as we need
-    # to ensure proxies are configured before attempting installs or
-    # updates.
-    proxy = hookenv.config()['snap_proxy']
-    if not data_changed('snap.proxy', proxy):
-        return  # Short circuit avoids unnecessary restarts.
-
-    path = '/etc/systemd/system/snapd.service.d/snap_layer_proxy.conf'
-    if proxy:
-        create_snap_proxy_conf(path, proxy)
-    else:
-        remove_snap_proxy_conf(path)
-    subprocess.check_call(['systemctl', 'daemon-reload'],
-                          universal_newlines=True)
-    time.sleep(2)
-    subprocess.check_call(['systemctl', 'restart', 'snapd.service'],
-                          universal_newlines=True)
-
-
-def create_snap_proxy_conf(path, proxy):
-    host.mkdir(os.path.dirname(path))
-    content = dedent('''\
-                        # Managed by Juju
-                        [Service]
-                        Environment=http_proxy={}
-                        Environment=https_proxy={}
-                        ''').format(proxy, proxy)
-    host.write_file(path, content.encode())
-
-
-def remove_snap_proxy_conf(path):
-    if os.path.exists(path):
-        os.remove(path)
-
-
-def ensure_path():
-    # Per Bug #1662856, /snap/bin may be missing from $PATH. Fix this.
-    if '/snap/bin' not in os.environ['PATH'].split(':'):
-        os.environ['PATH'] += ':/snap/bin'
-
-
-# Per https://github.com/juju-solutions/charms.reactive/issues/33,
-# this module may be imported multiple times so ensure the
-# initialization hook is only registered once. I have to piggy back
-# onto the namespace of a module imported before reactive discovery
-# to do this.
-if not hasattr(reactive, '_snap_registered'):
-    # We need to register this to run every hook, not just during install
-    # and config-changed, to protect against race conditions. If we don't
-    # do this, then the config in the hook environment may show updates
-    # to running hooks well before the config-changed hook has been invoked
-    # and the intialization provided an opertunity to be run.
-    hookenv.atstart(hookenv.log, 'Initializing Snap Layer')
-    hookenv.atstart(ensure_snapd)
-    hookenv.atstart(ensure_path)
-    hookenv.atstart(update_snap_proxy)
-    hookenv.atstart(install)
-    reactive._snap_registered = True
diff --git a/templates/ceph.conf b/templates/ceph.conf
 new file mode 100644
index 0000000..91459c6
--- /dev/null
+++ b/templates/ceph.conf
@@ -0,0 +1,19 @@
+###############################################################################
+# [ WARNING ]
+# glance configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+[global]
+{% if auth_supported -%}
+ auth_supported = {{ auth_supported }}
+ #keyring = /etc/ceph/$cluster.$name.keyring
+ keyring = {{ ringpath }}ceph.client.{{ service_name }}.keyring
+ mon host = {{ mon_hosts | join(' ') }}
+
+{% endif -%}
+{% if use_syslog -%}
+ log to syslog = {{ use_syslog }}
+ err to syslog = {{ use_syslog }}
+ clog to syslog = {{ use_syslog }}
+{% endif -%}
+
diff --git a/templates/ceph.keyring b/templates/ceph.keyring
 new file mode 100644
index 0000000..3781aa1
--- /dev/null
+++ b/templates/ceph.keyring
@@ -0,0 +1,5 @@
+[client.{{ username }}]
+        key = {{ key }}
+        caps mon = "allow r"
+        caps osd = "allow rwx"
+
diff --git a/templates/daemon_arguments b/templates/daemon_arguments
 new file mode 100644
index 0000000..bb40eef
--- /dev/null
+++ b/templates/daemon_arguments
@@ -0,0 +1,17 @@
+# Set the command-line arguments to pass to the ceph_exporter daemon
+{% if username is defined %}
+ARGS="-ceph.user {{ username }} {{ daemon_arguments }}"
+{%- else -%}
+ARGS="{{ daemon_arguments }}"
+{% endif %}
+
+# Example of the commands:
+#  -ceph.config string
+#        path to ceph config file
+#  -ceph.user string
+#        Ceph user to connect to cluster. (default "admin")
+#  -telemetry.addr string
+#        host:port for ceph exporter (default ":9128")
+#  -telemetry.path string
+#        URL path for surfacing collected metrics (default "/metrics")
+
diff --git a/wheelhouse/Jinja2-2.9.5.tar.gz b/wheelhouse/Jinja2-2.9.5.tar.gz
 deleted file mode 100644
index 82ae159..0000000
 Binary files a/wheelhouse/Jinja2-2.9.5.tar.gz and /dev/null differ
diff --git a/wheelhouse/MarkupSafe-0.23.tar.gz b/wheelhouse/MarkupSafe-0.23.tar.gz
 deleted file mode 100644
index 6b19006..0000000
 Binary files a/wheelhouse/MarkupSafe-0.23.tar.gz and /dev/null differ
diff --git a/wheelhouse/PyYAML-3.12.tar.gz b/wheelhouse/PyYAML-3.12.tar.gz
 deleted file mode 100644
index aabee39..0000000
 Binary files a/wheelhouse/PyYAML-3.12.tar.gz and /dev/null differ
diff --git a/wheelhouse/Tempita-0.5.2.tar.gz b/wheelhouse/Tempita-0.5.2.tar.gz
 deleted file mode 100644
index 755befc..0000000
 Binary files a/wheelhouse/Tempita-0.5.2.tar.gz and /dev/null differ
diff --git a/wheelhouse/charmhelpers-0.13.0.tar.gz b/wheelhouse/charmhelpers-0.13.0.tar.gz
 deleted file mode 100644
index c862e55..0000000
 Binary files a/wheelhouse/charmhelpers-0.13.0.tar.gz and /dev/null differ
diff --git a/wheelhouse/charms.reactive-0.4.5.tar.gz b/wheelhouse/charms.reactive-0.4.5.tar.gz
 deleted file mode 100644
index ff4e308..0000000
 Binary files a/wheelhouse/charms.reactive-0.4.5.tar.gz and /dev/null differ
diff --git a/wheelhouse/netaddr-0.7.19.tar.gz b/wheelhouse/netaddr-0.7.19.tar.gz
 deleted file mode 100644
index cc31d9d..0000000
 Binary files a/wheelhouse/netaddr-0.7.19.tar.gz and /dev/null differ
diff --git a/wheelhouse/pip-8.1.2.tar.gz b/wheelhouse/pip-8.1.2.tar.gz
 deleted file mode 100644
index e7a1a3c..0000000
 Binary files a/wheelhouse/pip-8.1.2.tar.gz and /dev/null differ
diff --git a/wheelhouse/pyaml-16.12.2.tar.gz b/wheelhouse/pyaml-16.12.2.tar.gz
 deleted file mode 100644
index 2ff0b0a..0000000
 Binary files a/wheelhouse/pyaml-16.12.2.tar.gz and /dev/null differ
diff --git a/wheelhouse/six-1.10.0.tar.gz b/wheelhouse/six-1.10.0.tar.gz
 deleted file mode 100644
index ac8eec5..0000000
 Binary files a/wheelhouse/six-1.10.0.tar.gz and /dev/null differ