From b78cbc7476f210e7ce83efb76145945bd76943f9 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 25 Jul 2017 15:37:44 -0700 Subject: [PATCH] Make the collectors a Python package Signed-off-by: Zack Cerza --- ansible/roles/ceph-collectd/files/cephmetrics | 1 + .../roles/ceph-collectd/files/cephmetrics.py | 1 - ansible/roles/ceph-collectd/files/collectors | 1 - .../tasks/install_collectd_plugins.yml | 18 ++++++++---------- cephmetrics.py => cephmetrics/__init__.py | 0 .../collectors}/__init__.py | 0 {collectors => cephmetrics/collectors}/base.py | 0 .../collectors}/common.py | 0 .../collectors}/iscsi.py | 0 {collectors => cephmetrics/collectors}/mon.py | 4 ++-- {collectors => cephmetrics/collectors}/osd.py | 6 +++--- {collectors => cephmetrics/collectors}/rgw.py | 4 ++-- 12 files changed, 16 insertions(+), 19 deletions(-) create mode 120000 ansible/roles/ceph-collectd/files/cephmetrics delete mode 120000 ansible/roles/ceph-collectd/files/cephmetrics.py delete mode 120000 ansible/roles/ceph-collectd/files/collectors rename cephmetrics.py => cephmetrics/__init__.py (100%) rename {collectors => cephmetrics/collectors}/__init__.py (100%) rename {collectors => cephmetrics/collectors}/base.py (100%) rename {collectors => cephmetrics/collectors}/common.py (100%) rename {collectors => cephmetrics/collectors}/iscsi.py (100%) rename {collectors => cephmetrics/collectors}/mon.py (99%) rename {collectors => cephmetrics/collectors}/osd.py (98%) rename {collectors => cephmetrics/collectors}/rgw.py (93%) diff --git a/ansible/roles/ceph-collectd/files/cephmetrics b/ansible/roles/ceph-collectd/files/cephmetrics new file mode 120000 index 0000000..e2d0dbe --- /dev/null +++ b/ansible/roles/ceph-collectd/files/cephmetrics @@ -0,0 +1 @@ +../../../../cephmetrics/ \ No newline at end of file diff --git a/ansible/roles/ceph-collectd/files/cephmetrics.py b/ansible/roles/ceph-collectd/files/cephmetrics.py deleted file mode 120000 index 8de2567..0000000 --- a/ansible/roles/ceph-collectd/files/cephmetrics.py +++ /dev/null @@ -1 +0,0 @@ -../../../../cephmetrics.py \ No newline at end of file diff --git a/ansible/roles/ceph-collectd/files/collectors b/ansible/roles/ceph-collectd/files/collectors deleted file mode 120000 index 5efd446..0000000 --- a/ansible/roles/ceph-collectd/files/collectors +++ /dev/null @@ -1 +0,0 @@ -../../../../collectors \ No newline at end of file diff --git a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml index 5af7367..2deb625 100644 --- a/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml +++ b/ansible/roles/ceph-collectd/tasks/install_collectd_plugins.yml @@ -7,19 +7,17 @@ set_fact: collectd_cephmetrics_dir: "{{ collectd_dir }}/cephmetrics" -- name: Create collectors directory +- name: Remove stale Python files file: - name: "{{ collectd_cephmetrics_dir }}/collectors" - state: directory + dest: "{{ item }}" + state: absent + with_items: + - "{{ collectd_cephmetrics_dir }}/cephmetrics.py" + - "{{ collectd_cephmetrics_dir }}/cephmetrics.pyc" + - "{{ collectd_cephmetrics_dir }}/collectors" - name: Ship collector plugins copy: - src: files/collectors/ - dest: "{{ collectd_cephmetrics_dir }}/collectors" - notify: Restart collectd - -- name: Ship cephmetrics.py - copy: - src: files/cephmetrics.py + src: files/cephmetrics dest: "{{ collectd_cephmetrics_dir }}" notify: Restart collectd diff --git a/cephmetrics.py b/cephmetrics/__init__.py similarity index 100% rename from cephmetrics.py rename to cephmetrics/__init__.py diff --git a/collectors/__init__.py b/cephmetrics/collectors/__init__.py similarity index 100% rename from collectors/__init__.py rename to cephmetrics/collectors/__init__.py diff --git a/collectors/base.py b/cephmetrics/collectors/base.py similarity index 100% rename from collectors/base.py rename to cephmetrics/collectors/base.py diff --git a/collectors/common.py b/cephmetrics/collectors/common.py similarity index 100% rename from collectors/common.py rename to cephmetrics/collectors/common.py diff --git a/collectors/iscsi.py b/cephmetrics/collectors/iscsi.py similarity index 100% rename from collectors/iscsi.py rename to cephmetrics/collectors/iscsi.py diff --git a/collectors/mon.py b/cephmetrics/collectors/mon.py similarity index 99% rename from collectors/mon.py rename to cephmetrics/collectors/mon.py index 7ca83c6..e332485 100644 --- a/collectors/mon.py +++ b/cephmetrics/collectors/mon.py @@ -7,8 +7,8 @@ import threading import time import logging -from collectors.base import BaseCollector -from collectors.common import merge_dicts, get_hostname +from cephmetrics.collectors.base import BaseCollector +from cephmetrics.collectors.common import merge_dicts, get_hostname class RBDScanner(threading.Thread): diff --git a/collectors/osd.py b/cephmetrics/collectors/osd.py similarity index 98% rename from collectors/osd.py rename to cephmetrics/collectors/osd.py index 152e7b0..4d394c2 100644 --- a/collectors/osd.py +++ b/cephmetrics/collectors/osd.py @@ -4,9 +4,9 @@ import os import time import math -from collectors.base import BaseCollector -from collectors.common import (todict, fread, freadlines, merge_dicts, - IOstat, Disk) +from cephmetrics.collectors.base import BaseCollector +from cephmetrics.collectors.common import ( + todict, fread, freadlines, merge_dicts, IOstat, Disk) __author__ = "Paul Cuzner" diff --git a/collectors/rgw.py b/cephmetrics/collectors/rgw.py similarity index 93% rename from collectors/rgw.py rename to cephmetrics/collectors/rgw.py index 36772e3..8fbbcf5 100644 --- a/collectors/rgw.py +++ b/cephmetrics/collectors/rgw.py @@ -2,8 +2,8 @@ import time -from collectors.base import BaseCollector -from collectors.common import get_hostname, merge_dicts +from cephmetrics.collectors.base import BaseCollector +from cephmetrics.collectors.common import get_hostname, merge_dicts __author__ = "paul.cuzner@redhat.com" -- 2.47.3