From e7b5f7e6123403e1fb0836783253aa1fa2f719f8 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Wed, 19 Aug 2020 13:47:29 +0200
Subject: [PATCH] Add monitoring server for newinfra

---
 hosts                                        |  1 +
 plays/monitoring.yml                         |  7 +-----
 roles/smartd-hp-smartarray/handlers/main.yml |  5 -----
 roles/smartd-hp-smartarray/tasks/main.yml    | 23 --------------------
 4 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 roles/smartd-hp-smartarray/handlers/main.yml
 delete mode 100644 roles/smartd-hp-smartarray/tasks/main.yml

diff --git a/hosts b/hosts
index 7cd1edd4..0d5280dc 100644
--- a/hosts
+++ b/hosts
@@ -79,6 +79,7 @@ belenios # on changera plus tard
 re2o-ldap.adm.crans.org
 gitlab-ci.adm.crans.org
 hodaur.adm.crans.org
+monitoring.adm.crans.org
 
 [ovh_physical]
 sputnik.adm.crans.org
diff --git a/plays/monitoring.yml b/plays/monitoring.yml
index e5b1cbff..6d90a5bc 100755
--- a/plays/monitoring.yml
+++ b/plays/monitoring.yml
@@ -1,7 +1,7 @@
 #!/usr/bin/env ansible-playbook
 ---
 # Deploy Prometheus and Grafana on monitoring server
-- hosts: fyre.adm.crans.org
+- hosts: monitoring.adm.crans.org
   vars:
     # Prometheus targets.json
     prometheus:
@@ -72,11 +72,6 @@
     adm_ipv4: "{{ ansible_all_ipv4_addresses | ipaddr(adm_subnet) | first }}"
   roles: ["prometheus-apache-exporter"]
 
-# Configure HP RAID monitoring
-# You can list SCSI drives with `lsscsi -g`
-- hosts: fyre.adm.crans.org,gateau.adm.crans.org
-  roles: ["smartd-hp-smartarray"]
-
 # Monitor mailq with a special text exporter
 - hosts: redisdead.adm.crans.org
   roles: ["prometheus-node-exporter-postfix"]
diff --git a/roles/smartd-hp-smartarray/handlers/main.yml b/roles/smartd-hp-smartarray/handlers/main.yml
deleted file mode 100644
index 98985f1c..00000000
--- a/roles/smartd-hp-smartarray/handlers/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: Restart smartd
-  service:
-    name: smartd
-    state: restarted
diff --git a/roles/smartd-hp-smartarray/tasks/main.yml b/roles/smartd-hp-smartarray/tasks/main.yml
deleted file mode 100644
index f9ba1ce7..00000000
--- a/roles/smartd-hp-smartarray/tasks/main.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Install smartd
-  apt:
-    update_cache: true
-    name: smartmontools
-  register: apt_result
-  retries: 3
-  until: apt_result is succeeded
-
-- name: Disable smartd autodiscovery
-  lineinfile:
-    path: /etc/smartd.conf
-    regexp: '(?i)^(DEVICESCAN.*)'
-    line: '#\1'
-    backrefs: true
-  notify: Restart smartd
-
-- name: Monitor local HP SmartArray
-  lineinfile:
-    path: /etc/smartd.conf
-    regexp: '^/dev/sg0'
-    line: /dev/sg0 -a -d cciss,0 -m root
-  notify: Restart smartd