diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-14 17:06:42 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-02-14 17:06:42 +0100 |
commit | a1a4a72ea8cacd9edddc368626fb617989fa964d (patch) | |
tree | 7f7f450837b573d2bc532c0588357fca93edf124 /modules/private | |
parent | 8bf83d7a27c08599820f145c073d979744b81c63 (diff) | |
download | Nix-a1a4a72ea8cacd9edddc368626fb617989fa964d.tar.gz Nix-a1a4a72ea8cacd9edddc368626fb617989fa964d.tar.zst Nix-a1a4a72ea8cacd9edddc368626fb617989fa964d.zip |
Completely remove immae.eu
Diffstat (limited to 'modules/private')
-rw-r--r-- | modules/private/databases/default.nix | 6 | ||||
-rw-r--r-- | modules/private/monitoring/default.nix | 2 | ||||
-rw-r--r-- | modules/private/monitoring/objects_backup-2.nix | 4 | ||||
-rw-r--r-- | modules/private/monitoring/objects_immae-eu.nix | 70 |
4 files changed, 3 insertions, 79 deletions
diff --git a/modules/private/databases/default.nix b/modules/private/databases/default.nix index 27b0ba8..c4a023a 100644 --- a/modules/private/databases/default.nix +++ b/modules/private/databases/default.nix | |||
@@ -46,12 +46,6 @@ in | |||
46 | inherit (config.myEnv.servers.eldiron.ldap) dn password; | 46 | inherit (config.myEnv.servers.eldiron.ldap) dn password; |
47 | }; | 47 | }; |
48 | authorizedHosts = { | 48 | authorizedHosts = { |
49 | immaeEu = [{ | ||
50 | ip4 = [ | ||
51 | config.myEnv.servers.immaeEu.ips.main.ip4 | ||
52 | config.myEnv.servers.immaeEu.ips.alt.ip4 | ||
53 | ]; | ||
54 | }]; | ||
55 | }; | 49 | }; |
56 | replicationHosts = { | 50 | replicationHosts = { |
57 | backup-2 = { | 51 | backup-2 = { |
diff --git a/modules/private/monitoring/default.nix b/modules/private/monitoring/default.nix index d23e9c5..8b45d47 100644 --- a/modules/private/monitoring/default.nix +++ b/modules/private/monitoring/default.nix | |||
@@ -122,7 +122,7 @@ let | |||
122 | }; | 122 | }; |
123 | otherObjects = map | 123 | otherObjects = map |
124 | (n: (pkgs.callPackage (./. + "/objects_" + n + ".nix") { inherit emailCheck; })) | 124 | (n: (pkgs.callPackage (./. + "/objects_" + n + ".nix") { inherit emailCheck; })) |
125 | [ "caldance-1" "ulminfo-fr" "immae-eu" "phare" "tiboqorl-fr" ]; | 125 | [ "caldance-1" "ulminfo-fr" "phare" "tiboqorl-fr" ]; |
126 | masterObjects = pkgs.callPackage ./objects_master.nix { inherit config; }; | 126 | masterObjects = pkgs.callPackage ./objects_master.nix { inherit config; }; |
127 | commonObjects = pkgs.callPackage ./objects_common.nix ({ | 127 | commonObjects = pkgs.callPackage ./objects_common.nix ({ |
128 | master = cfg.master; | 128 | master = cfg.master; |
diff --git a/modules/private/monitoring/objects_backup-2.nix b/modules/private/monitoring/objects_backup-2.nix index 927cc25..cc8e36b 100644 --- a/modules/private/monitoring/objects_backup-2.nix +++ b/modules/private/monitoring/objects_backup-2.nix | |||
@@ -29,9 +29,9 @@ in | |||
29 | } | 29 | } |
30 | { | 30 | { |
31 | passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; }; | 31 | passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; }; |
32 | service_description = "Last backup in /backup2/immae_eu is not too old"; | 32 | service_description = "Last backup in /backup2/dilion is not too old"; |
33 | use = "local-service"; | 33 | use = "local-service"; |
34 | check_command = ["check_last_file_date" "/backup2/immae_eu" "14" "backup"]; | 34 | check_command = ["check_last_file_date" "/backup2/dilion" "14" "backup"]; |
35 | } | 35 | } |
36 | { | 36 | { |
37 | passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; }; | 37 | passiveInfo = defaultPassiveInfo // { servicegroups = "webstatus-backup"; }; |
diff --git a/modules/private/monitoring/objects_immae-eu.nix b/modules/private/monitoring/objects_immae-eu.nix deleted file mode 100644 index 96f91aa..0000000 --- a/modules/private/monitoring/objects_immae-eu.nix +++ /dev/null | |||
@@ -1,70 +0,0 @@ | |||
1 | { ... }: | ||
2 | let | ||
3 | defaultPassiveInfo = { | ||
4 | use = "external-passive-service"; | ||
5 | freshness_threshold = "450"; | ||
6 | retry_interval = "1"; | ||
7 | host_name = "immae.eu"; | ||
8 | }; | ||
9 | in | ||
10 | { | ||
11 | host = { | ||
12 | "immae.eu" = { | ||
13 | alias = "immae.eu"; | ||
14 | address = "immae.eu"; | ||
15 | use = "linux-server"; | ||
16 | hostgroups = "webstatus-hosts"; | ||
17 | _webstatus_name = "immaeEu"; | ||
18 | }; | ||
19 | }; | ||
20 | service = map (s: defaultPassiveInfo // s) [ | ||
21 | { | ||
22 | service_description = "size on root partition"; | ||
23 | servicegroups = "webstatus-resources"; | ||
24 | } | ||
25 | |||
26 | { | ||
27 | service_description = "total number of process"; | ||
28 | servicegroups = "webstatus-resources"; | ||
29 | } | ||
30 | |||
31 | { | ||
32 | service_description = "average load"; | ||
33 | servicegroups = "webstatus-resources"; | ||
34 | } | ||
35 | |||
36 | { | ||
37 | service_description = "swap usage"; | ||
38 | servicegroups = "webstatus-resources"; | ||
39 | } | ||
40 | |||
41 | { | ||
42 | service_description = "no mdadm array is degraded"; | ||
43 | servicegroups = "webstatus-resources"; | ||
44 | } | ||
45 | |||
46 | { | ||
47 | service_description = "ntp is activated and working"; | ||
48 | servicegroups = "webstatus-resources"; | ||
49 | } | ||
50 | |||
51 | { | ||
52 | service_description = "ssh connexion responds"; | ||
53 | } | ||
54 | |||
55 | { | ||
56 | service_description = "pacman packages are not too old"; | ||
57 | servicegroups = "webstatus-resources"; | ||
58 | freshness_threshold = "10800"; | ||
59 | notification_interval = "0"; | ||
60 | } | ||
61 | |||
62 | { | ||
63 | service_description = "tinc@Immae service is active"; | ||
64 | } | ||
65 | |||
66 | { | ||
67 | service_description = "sshd service is active"; | ||
68 | } | ||
69 | ]; | ||
70 | } | ||