nagios-charmers team mailing list archive

[Andrea Ieri <andrea.ieri@xxxxxxxxxxxxx>]

Andrea Ieri has proposed merging ~aieri/hw-health-charm:oo-prep into hw-health-charm:master.

Requested reviews:
  Wouter van Bommel (woutervb)

For more details, see:
https://code.launchpad.net/~aieri/hw-health-charm/+git/hw-health-charm/+merge/364081

These are a couple of preparatory commits to make the next large changeset a little smaller
-- 
Your team Nagios Charm developers is subscribed to branch hw-health-charm:master.

diff --git a/src/README.md b/src/README.md
index 971b86c..0c72612 100644
--- a/src/README.md
+++ b/src/README.md
@@ -1,20 +1,20 @@
 # Overview
 
-This charm installs Vendor supplied system monitoring tools and configures
+This charm installs various harware system monitoring tools and configures
 Nagios NRPE checks. It will only work for bare-metal installations on specific
 hardware.
 
 Currently supported hardware is:
-  * Dell: LSI Logic MegaRAID SAS (Broadcoam MegaCLI utility)
-
-  * Supermicro: LSI SAS3008 RAID card with sas3ircu (Broadcoam's SAS3IRCU_P16)
-  mp3sas linux driver
 
+ * Dell: LSI Logic MegaRAID SAS (Broadcom MegaCLI utility)
+ * Supermicro: LSI SAS3008 RAID card with sas3ircu (Broadcoam's SAS3IRCU_P16)
+   mp3sas linux driver
  * Huawei: LSI SAS2308 RAID card with sas2ircu (Huawei FusionServer Tools
- InfoCollect)
+   InfoCollect)
+
+Hardware-independent tools:
 
  * Linux software RAID (mdadm)
- 
  * IPMI as implemented by freeipmi
 
 In the backlog, hp-health logic still needs to be backported to support
@@ -22,6 +22,7 @@ Hewlett-Packard equipment (HP Smart Array Controllers and MSA Controllers with
 hpacucli, hpssacli, ssacli).
 
 Furthermore, other hardware in the roadmap is:
+
   * Huawei's ES3000 V2 PCIe SSD Card with hio_info (Huawei ES3000 V2 Driver)
   * S.M.A.R.T. Monitoring tool (smartctl)
 
@@ -40,9 +41,8 @@ juju add-relation hw-health nrpe
 Charmstore version already ships a resource. However, a new resource can be
 attached:
 
-  * Option 1: `juju deploy hw-health --resource tools=/tmp/zipfile.zip`
-
-  * Option 2: `juju attach-resource hw-health tools=/tmp/zipfile.zip`
+ * Option 1: `juju deploy hw-health --resource tools=/tmp/zipfile.zip`
+ * Option 2: `juju attach-resource hw-health tools=/tmp/zipfile.zip`
 
 In both cases format of zipfile.zip must be one of the following:
 ```
@@ -72,5 +72,5 @@ Please contact the Nagios charmers via the "Submit a bug" link.
 
 ## Upstream Project Name
 
-  - Website: https://launchpad.net/hw-health-charm
-  - Bug tracker: https://bugs.launchpad.net/hw-health-charm
+ * Website: https://launchpad.net/hw-health-charm
+ * Bug tracker: https://bugs.launchpad.net/hw-health-charm
diff --git a/src/files/check_mdadm.py b/src/files/mdadm/check_mdadm.py
similarity index 100%
rename from src/files/check_mdadm.py
rename to src/files/mdadm/check_mdadm.py
diff --git a/src/files/cron_mdadm.py b/src/files/mdadm/cron_mdadm.py
similarity index 100%
rename from src/files/cron_mdadm.py
rename to src/files/mdadm/cron_mdadm.py
diff --git a/src/files/mpt/check_sas2ircu.py b/src/files/sas2ircu/check_sas2ircu.py
similarity index 100%
rename from src/files/mpt/check_sas2ircu.py
rename to src/files/sas2ircu/check_sas2ircu.py
diff --git a/src/files/mpt/check_sas2ircu.sh b/src/files/sas2ircu/check_sas2ircu.sh
similarity index 100%
rename from src/files/mpt/check_sas2ircu.sh
rename to src/files/sas2ircu/check_sas2ircu.sh
diff --git a/src/files/mpt/check_sas3ircu.py b/src/files/sas3ircu/check_sas3ircu.py
similarity index 100%
rename from src/files/mpt/check_sas3ircu.py
rename to src/files/sas3ircu/check_sas3ircu.py
diff --git a/src/files/mpt/check_sas3ircu.sh b/src/files/sas3ircu/check_sas3ircu.sh
similarity index 100%
rename from src/files/mpt/check_sas3ircu.sh
rename to src/files/sas3ircu/check_sas3ircu.sh
diff --git a/src/lib/utils/tooling.py b/src/lib/utils/tooling.py
index bef4b4f..40b140c 100644
--- a/src/lib/utils/tooling.py
+++ b/src/lib/utils/tooling.py
@@ -17,17 +17,17 @@ TOOLING = {
     },
     'sas2ircu': {
         'snap': 'sas2ircu',
-        'filename': 'mpt/check_sas2ircu.py',
-        'cronjob': 'mpt/check_sas2ircu.sh'
+        'filename': 'sas2ircu/check_sas2ircu.py',
+        'cronjob': 'sas2ircu/check_sas2ircu.sh'
     },
     'sas3ircu': {
         'snap': 'sas3ircu',
-        'filename': 'mpt/check_sas3ircu.py',
-        'cronjob': 'mpt/check_sas3ircu.sh'
+        'filename': 'sas3ircu/check_sas3ircu.py',
+        'cronjob': 'sas3ircu/check_sas3ircu.sh'
     },
     'mdadm': {
-        'filename': 'check_mdadm.py',
-        'cronjob': 'cron_mdadm.py'
+        'filename': 'mdadm/check_mdadm.py',
+        'cronjob': 'mdadm/cron_mdadm.py'
     },
     'ipmi': {
         'filename': 'ipmi/check_ipmi_sensor',
diff --git a/src/tests/unit/test_check_mdadm.py b/src/tests/unit/test_check_mdadm.py
index c58886d..231ca4f 100644
--- a/src/tests/unit/test_check_mdadm.py
+++ b/src/tests/unit/test_check_mdadm.py
@@ -6,7 +6,7 @@ import unittest.mock as mock
 
 import nagios_plugin3
 
-sys.path.append('files')
+sys.path.append('files/mdadm')
 import check_mdadm  # noqa: E402
 
 
diff --git a/src/tests/unit/test_check_sas2ircu.py b/src/tests/unit/test_check_sas2ircu.py
index 727f0f6..1d0dc80 100644
--- a/src/tests/unit/test_check_sas2ircu.py
+++ b/src/tests/unit/test_check_sas2ircu.py
@@ -4,7 +4,7 @@ import sys
 import unittest
 import unittest.mock as mock
 
-sys.path.append('files/mpt')
+sys.path.append('files/sas2ircu')
 import check_sas2ircu  # noqa: E402
 
 
diff --git a/src/tests/unit/test_check_sas3ircu.py b/src/tests/unit/test_check_sas3ircu.py
index ee59571..5747de9 100644
--- a/src/tests/unit/test_check_sas3ircu.py
+++ b/src/tests/unit/test_check_sas3ircu.py
@@ -4,7 +4,7 @@ import sys
 import unittest
 import unittest.mock as mock
 
-sys.path.append('files/mpt')
+sys.path.append('files/sas3ircu')
 import check_sas3ircu  # noqa: E402
 
 
diff --git a/src/tests/unit/test_cron_mdadm.py b/src/tests/unit/test_cron_mdadm.py
index ac4fe58..d124931 100644
--- a/src/tests/unit/test_cron_mdadm.py
+++ b/src/tests/unit/test_cron_mdadm.py
@@ -5,7 +5,7 @@ import sys  # noqa: F401
 import unittest
 import unittest.mock as mock
 
-sys.path.append('files')
+sys.path.append('files/mdadm')
 import cron_mdadm  # noqa: E402